diff --git a/.travis.yml b/.travis.yml
index c5a9993..4e13a83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,4 +10,4 @@
   - pyrus install http://pear.php-tools.net/get/vfsStream-0.11.2.tgz
   - phpenv rehash
 
-script: phpunit --configuration phpunit.xml
\ No newline at end of file
+script: phpunit --configuration tests/phpunit.xml 
\ No newline at end of file
diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 02c425b..5acfd6b 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -173,7 +173,7 @@
 {
 	function camelize($str)
 	{
-		return substr(str_replace(' ', '', ucwords(preg_replace('/[\s_]+/', ' ', $str))), 1);
+		return strtolower($str[0]).substr(str_replace(' ', '', ucwords(preg_replace('/[\s_]+/', ' ', $str))), 1);
 	}
 }
 
diff --git a/phpunit.xml b/tests/phpunit.xml
similarity index 75%
rename from phpunit.xml
rename to tests/phpunit.xml
index 2ae7ba3..abb9881 100644
--- a/phpunit.xml
+++ b/tests/phpunit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit 
-	bootstrap="tests/Bootstrap.php"
+	bootstrap="Bootstrap.php"
 	colors="true"
 	convertNoticesToExceptions="true"
 	convertWarningsToExceptions="true"
@@ -11,10 +11,10 @@
 	stopOnSkipped="false">
 	<testsuites>
 		<testsuite name="CodeIgniter Core Test Suite">
-			<file>tests/codeigniter/Setup_test.php</file>
-			<directory suffix="test.php">tests/codeigniter/core</directory>
-			<directory suffix="test.php">tests/codeigniter/helpers</directory>
-			<directory suffix="test.php">tests/codeigniter/libraries</directory>
+			<file>codeigniter/Setup_test.php</file>
+			<directory suffix="test.php">codeigniter/core</directory>
+			<directory suffix="test.php">codeigniter/helpers</directory>
+			<directory suffix="test.php">codeigniter/libraries</directory>
 			<!-- We'll worry about these later ...
 			<directory suffix="test.php">codeigniter/libraries</directory>
 			<directory suffix="test.php">codeigniter/helpers</directory>